Made Ports better