some cahnges for josh q scan