Making some changes #1