try #2, not fully succesful...
regen for 6972093