more commits
https://trello.com/c/Z3ocoHWM/3-important-feature