Changed to use buffer local port
Merge branch 'working_binaries' into working