Major updates to amp_ordinate