include patches from lucas stach