support for 5.8 and 5.10