More Changes for EDU-12184