Added tracker to controller