Feature/end state implementation