Minor tweaks, still doesn't work