Task/update to new behavior