Check point - added code from both Toms and plan to change approach.