Added better pathin'