added reloader again. trying some refactoring