Dibyo's data
Fix merge conflicts between Dibyo and Harry's forks