Rebuilt for testing