Added the state back in