First revision; all tests passed