Changed how onChange is handled