- Improved for custom.