Some final changes
Final version was done