Updated for ver 1.2.1