Revision and optimization