More changes, adding a max