Changes for clarity, SP13
up to date with skeleton