better path resolving..
better path resolving..
better path resolving..