Updated to automatically detect whether 6.1+ or lower