ontheroad...
did some refactoring