aaded some modules and tweaked the style