Improved assignment