Few tweaks to updated submission.