v2.1 fixed encryption issues