Suggestion for team or just keep it how it is for now