added tracking behaviour