Modification during weekend
Resolved conflict with Patrick's update