added PORT options
merge