Yasmine's Lab5 changes