added soem things. may need to reconsider how i do the SA/SD