added shape tracking