change to skeleton based design