Merged Din's and Gustavo's projects