BSB-55 - finally right code...Git problems