Making it work again as v0-3