Modified current work practices
merged