Just found these changes on my localspace. idk if all works, just thought it may be more useful here than on my disk.