Issues removed in exercise5