Enhanced the cipher