Added final status checking