Added start and end states
Added score