Big fix to how status is handled