v3 + v4 compatible

Signed-off-by: Elliot Condon <e@elliotcondon.com>