beginning to standardize the psd and asd code base