Improved code overlay