removed some of arbitrary limitations