#192 forgot a few things