not broken anymore, the code is almost generating correctly