Kubuscmg less modularizing