Switch unit to being static