Re #129 Uncomment some important lines