fine tuning and adding access management