final ver 1.1