Some more few changes