addtions added to broker and fixed block