final commit attempt ver. 2