adding some controls to final check