Made some changes specific to our needs