I agree on the restriction being a bit of a hinderance, especially on the choosing an upgrade. Dialogue interactions are really useful sometimes.
