Working without file split. need to fix removals