a couple changes to save some space