about to merge Scooter
resolved?
working with scooter changes
working with scooter changes