final commit ver 1