cleaned up weirdness with saving filepath