add acces and small changes