break for master
bug fixed, removed DOM thrashing