Update vectors, restructure print output