Changed Some Things !!!