updated solutions and answers