New code updates