Functions from Dilba et al. added