more skeleton changes

more changes