updated implentation issues to reflect tracking bug