change schema  + fix elevate