changes from Jason added in