adding changes for newest force version