skeleton improvements