Update Solution for #1