Added units to logic