Playing with team city. Minor changes