Last context is pending: refactoring following up