big changes for 1.1.7