moved coded to solver
added import