Made some nice changes