Update Solution for #2