Changes for task 433 and 434