added switch s selection; add empty functions