Big update v 2.0 by loc