add short circuiting to prepopulation