Made it use os.path