using standard paths, removing hard coding