Nip refactored