Continuing to add the checks into make node