VID-2016 slightly better solution