Updated to alpha 04 and made it properly