Truck code + makefile changes