added none state
renamed setState