remove object.assign instead directly assign to state
created new constants