Modifications XJ & GUI