Changed to non-model form for switchboard