more skeleton changes