Update design comment
Update source