Jeff's first modification

Welcome... and test