Added Nabil's setup