Removing early exit()