Made less stupid