Updated stuff

could this conclude it?