Added layer for units.
Simplified watch checks.