committing changes in saved dir
clean and ready for scooters changes
brought in latest from scooter