Final project

already fix bug