correct import for filename change
refactoring functions
new functions