find and modify + little changes to return