Added Vandelay functionality