Updated with New switch helper