merging Dulip and Tobi's commits