Renamed my convenience-hacked version, added pristine original version