Added better support for older devices