SRV hack part 3 and final - works now