first steps to 5.0 compatibility -- untested