first commit - version 2
commit before updating to simpler version
fixed conflicts