Much better (do not use hardcoded variables). Update Bibi's code the same way.