Changed button by switch