some uncomment changes