Improvement to Auto Populate!