latest merge + personal