Modified port and removed header