Issue 255: Return to Endor

Issue 255: Return to Endor