cleaned up some of the fallbacks