Lots of changes for HillSurfing