shape tracking added