minor changes, still doesnt work