pull from both possible folders