tasks # 618, 619