Some temporary changes for some testing