Reverted to earlier version + encrypting