uncomment things that now work