Added find, other updates?