Merge fix, refactor