updated components to conditioanlly load