Updated greg