Updated, so the encryption works properly now