Make requested changes from Jason