rename and add more code still in alphastate