latest updates: integration with Bianca's work