lars updates to maky solution more smooth and ux friendly :)