minor changes, still doesn't work