chainged permissions and updated TODO