RE: Last set of changes for 1.1.3