less static code, replaced it to be more modular