FroshProject improvements