refactoring + acces problem fixes