Updated to work with alpha 4