Preparing for a release
added permission check