Added more of Bjorn's rigid requirements;