Updated for final step