added Fare card and calculator