Added back all the checks