added permissions checks removed unnecssary code/comments fixed minor bug on invalid problem
Changed paths: