small modifications
maintaining compatibility with RA2.1