Adding FinalCheck to avoid chaos but it is not used currently