Early implementation of re-write