Implemented IncludeLinks
Tidying up