Added final tag to account state