small changes from Jason