Moved modifiers
Added helper functions