Adding the last few changes