Marking for complete rewrite - changing approach