Added Kevin's changes to the existing code base