Further improved. Stil not finished.