added more broker stuff