Add ActualSpdPerc and fix states