modify construct.rs for matching