Some tweaking..