made a few modifications