Changes to properly accomodate passenger