Updated skeleton a bit.