Simpler re-write