added port, map wraparound