Updated to Katana RC2