still unit.c changes