Add placeholder 6 and 7.  Add simplify function calls