I'm much more comfortable with this structure