merging changes from the YouGov's fork