Modify based on Thomas response
Jerry's contributions in.