more skeleton modifications, with partial implementations