path fixed; wrt duplication, pretty sure a refactor is probably and preferable but just not done yet.