Added little touches