Initial modification of original project: loading data