some changes, but still doesnt work