Reworking find_last