added support for 4.8 & 4.7