more changes

oh dear oh dear oh dear