changes to skeleton framework