Tasks 7, 12, 13 Added