Before session 6
merge session5