Updated X Carrier to fit new setup