overhauled image client