small change to load data declaration
more refactoring
unwanted changes