[r] big refuck & new protocol support