some tweaking and a define.