Re-added accidentally deleted lines