Some more tweaking x13