Added Crypto A2, changed a little stuff