Just a few modifications