udpate, and removed min, cause it's currently broken