Rewritten -- finally committing