first batch of changes for 1.1