fixed lag but still needs work