patch implementation and readd flows