Updated with latest notes from @ataulm