Updated with permission fix