Modify has functions more simple way