C7 : Upgraded : clarity + comments