Sweet updates merged