Added tracking points in form