Added i6/+ Compatibility