Bojcik Waldwick rebuild

Rebuild