With check for empty string
with remove first code dup around an h