First version with mutable vpath