Reworked transporter code