minor re-work