There is lot of commits from the last one, so... Some adds :x