simplified paths slightly