changed few more stuffs