namespace changes, gesture switch added