Much improvements

Such awesome