replaced andThen with onSuccess