Improve processing