Faster cluster addr calculation
More simple replacement test