Changed how the status gets calculated