Chris/Caroline Fixing permissions