More control/ refactoring