adds tracker feature #333