final changes for working alpha