Fix tasks 4-6