changed to better topic handling