Some last tweaks, still not working