Major (Solution) : added some new behavior