Solver update
DO MAP BACK UP BEFORE PULL (sorry for maj XD)