some upates from upstrem