Added separate handling of ports ( poss zero)