Changed Code More