Some modifications, I guess