Make it work with 4.2 and 4.3