Added little improvements