more changes as per discussion.  good to go