reworking passenger code