comment revision, move find() to base class