Trying to reduce footprint of changes