both dynamic and non dynamic versions brought up to speed