Add mabuchi, change host