Task-3 many final changes