re#32 partially added f21