updated courseware branch