Getting close to fixing the multiple advertising users issue