David - Update to use correct port numbes