First round of changes, attempt 2