WIP2
fixes sppmpa-rr