remove last change, add todo, test right: 100%