Added Return to Eden plus some refactoring