Added simple switch