Added more terms

still need to be added into subsequent loops