update with changes from rreuter