Ken branch pull request

Amazing changes made by Ken