This could be moved with the block at line 94