merge from Tom (fixing amIAlpha)