including recent code changes (check if port free)