Updated for final iteration