more changes

doesnt work at line 73