IF Statement and many code updates.