Started to go berserk with DI