WIP Use local directories see if it helps