merged new thing changes