ReEdit-2 pr-03
merged work
reviewed f/pr-03