Added more access control
merge