Remerge mabdul's alpha changes

Had to revert and remerge because I broke everything.