There are some functions that could return base but don't. Investigate whether or not it makes sense to update these units.