updated with latest from nudge