Done some minro changes