Managed a bit more patchwork