trying to merge this to files