reworked skeleton