combining changes from x300