more updates to the skeleton handlers