uncomment some portions