lots of changes for 1.2