more updates to skeleton