Repackaged Client slightly