Some stupid improvements ..