Issue ITTE-639

I finished the last two tasks.