ticket#2: commit for switching between versions
ticket#2: make some changes to conform requirements