Continue with April 7th changes