Added timer + removed FFA
removed extra wait