Added most of the SA features