1. change the way of loading data;
2. fix a minor warning;