few changes regarding access