some nice changings