add tracking to ensure functionality with metrics monitoring later on