Made two changes