Changed appropriate objects from extending object to extending moving object
Fixed conflicts