Improved the flow and secured the access more