Changed the way thing will be done