Fixed access control and removed hard coded values
merge