fixed how aff_s are handled... not sure this is how I want it to go definitively