change uniformization and make the code horribly complicated