Modified to remove contains

Removed contains, substituted in function. No additional errors seem to
be generated running test suite