Change JSON logic instead

This way current users with existing settings get the speedup