still have to fix flickering issue