Imlement solutions for #32 and #29