Added latest changes made on libz600 work machine