Moved existance check to new file