Qml improved, testing needed