Updated skeleton