Just commented stuff, this is as it was submitted