Take 3...this should address all the issues.