improve masq, add stats