Updated GJS Code