These are the changes to eliminate most of the arbitrary limits in the