added wagma's contribution