Final code updates