Added some new changes to get access