Added final check