second test version, near final