changes to copy from Ulma & Yohan