Not sure what changed
Changed some functions up prep for pagination