Design and req analysis now polished