UPDATED: Eluna
Some changes to taxi