Added Federica's features