Adding more states to try and remove any loops.