changes to skeleton 2