updated for auto population