Added more missing info and a  simple switch for testing