Updated final paper