more work on continual world wrap