Minor updates
Full skeleton