minor re-design