5/11 final commit before submitting to icon