Some modifications (not finished)