The easiest fix would be to make everything a table-top item. I don't see the gain in the current restrictions.