Jarv/var updates