Updated using partials