Some lines no longer commented out