Lot of changes for make working