More version-agnostic script