Slight modifications to the post Awazza proxy