Fixed some refreshing logic to be faster