Changes suggested after testing the update