couple more v5 suggestions