version 2
version 2.1

changed some factors' name