Fixing bugs
Adding additional encryption