Added some nice changes