a couple of changes in beginning of 4.1