modulized things a bit