@laanwj let me analyze the code... i have some fears changing to much in core files. :)