Remove startwith, added take-t, fixed switch