added unit tracking