MODIFIED: angles instead of update count.