Some little Changes :)