added filepath resolution