Added broadcast, clean stuff