integrate changes from generator