wrok a bit on consolidation… not finshed now