halfway done
new changes