Updated Problem and partial code