Extra notes thanks to Josh's review