updating and refreshing with no bugs:)