Suggestion to put next class update!