I need to fix those, they were a bit of patchwork