[FIX & ADD] 8 hosts & 16 hosts

Fixed and added 8 & 16 hosts;