last few changes