TODO in expand
bug correction in expand
Comment in of_on_liam
change order in output of of_on_liam