Some little Changes...