final commit issue #3