major update for ver 1.1