Added more port stuff