modification based on Jesse's feedback