new version updated with less labels, better integration