Update Solution for #3