changes done by gregor together with derek to accelerate the development