some little changes for data usage
some little changes for data usage