Greg's changes