Applying @NeverMind2992