Ray's changes
Ray's changes