Updated code skeleteon