add changes made in session on 26.05. (Monday)