Add remaining functions necessary for andersen's