Updated stuff from lecture