New proposal sounds good to me. I was actually going to suggest that. Ammo uptil 20. It wouldn't devalue ammo pickups a lot in some levels and keep balance roughly the same. Let's not devalue the risk and reward of kicking powerups too hard.