Jarv/single instance updates