Updated to new paths