C3_SalmaFG_#77: Salma recommited changes