added fall back stuff