Changes made by Mike Vanniekerk (mfvanniekerk@gmail.com).