Continuing tweaking this patch...