Some updates to see if I can use or understand this code again.