second update - testing phase
new changes