Pretty up shouldUpdate logic