commit with 2 issues #4, #3