Added Kevin's changes