Removed debugging code
Added modifiers