more changes

done