Made some useful changes