style updates
permission handling update
permission handling update