switch didnt work - back to conditional table