built with gererdorf changes applied