but of groovyfying
fixed some bugs and more parallel