method extraction and todos on passenger