Added custom switch object
Fixed merge conflicts