Add the rest of the updated code.
Authored by: Fran Pena 2020-07-16
Parent: [f0ac48]
Child: [d71046]