Recommit for hw submission

Recommit for hw submission