Re-added 2 accidentally deleted lines