Complete BONUS assignment