added comments should all be done by now