Attempted re-write