Revert "Revert "Bolun Zhang Assignment""

This reverts commit 839a88580d3532d89521db23f5ed56268cb441a8.