added forwardzone and fixed inclusions