Better wulity code for Task 532