Agreed, I'd like to see a separate 2P category