More in flicker issue (Refactor needed).