Updates to SA. Renaming methods.