added ability to handle modifiers