Prod version with bugs corrections