Implimeteted the evade states
Changed timeout on evade states