Modified to use find instead of first