just a few modifications