more conditionals to dir loading