Redfined function names for continutity
Moved data file