I'm guessing something isn't right the check for state, commenting it out for now