//Fix bugs and add encrypt data