mikedixoncm's suggestions implemented