Update to Alpha6
Fix assembly