Clarified and expanded