my work
with new file
merge fix with database move