Updating from main - properly this time, with luck