Made some additional changes