Manual copied chris-little's V5 modifications into the repository