A lot of twisted changes in one commit, again :(