fixed for pushes and correct percentage