Added epidemic and inspector announcement in correct places