simplified calls and added comments