update to Optional Chaining