Make d less crazy