Added tracking Lock field, track finger and change to model