Improve week3