Removed dependence upon getpath!!!