switching to static and DI