logging instructorview
merge fixed