Updated with alpha changes