Update: mix

still has bug