reorganized enter/leave and get/put arguments/values