Sync up with the homework version

Sync up with the homework version