update to match recent markup changes