RB insert + some fixed