Updated Switch Action