next alpha with two fixes
further clarification