Major (Soliution) : added some new behavior