Sync up with current implementation.