use optionals instead of objects that are thrown away. /ht @solomon23