Renamed file and posted latest version, this time without the test code