fisrt final commit