Ex6 + extra credit