Updated implementations.