Updated for better integration.