re #fix_5B refractor code