Make another port and add test functional