Added 'use strict'
Added unit switching