update before testing child
delete useless code
change for school & market