Controls ok + refactoring on loading models