get rid of Optional stuff and simplify