Refactor pieces
Merge commit