added more tracking