Added transient state and some changes to it