#25 Use .then instead of .finally