Added modifier logic