Remove max, change to range
Remove max, change to range
Added Function Selection