Updated for solve