some nice changes