Amended the section handling to provide a better source link