Some modf
Some modifications