Changed arg order, added comments