Minor changes. Still not working consistently with more than one JID