Updated Farrah's work