Code enhancements, part 3