Added i605 support