Bond logic added, Market enhanced