minor tweaks, still not working