Updated to work on edX Studio and LMS