implemented clarity changes