Large number of changes for 1.1.3