Now using EUI's edition of the citystatediplopopup