switch added with incomplete functionality