Added contains()
Simplified getRecordNumber()