Canon is revealing several new cameras at the CP+ photo show in Tokyo this week. In addition to a handful of updates to its compact PowerShot lineup, the company is replacing the high-end compact G1 X with an updated model, and retiring its T3 D-SLR and replacing it with a new entry-level model, the T5.

The PowerShot G1 X Mark II promises to rectify many of the issues that we encountered when shooting with the original G1 X. That camera excelled in terms of image quality, but its bulky design and slow autofocus system made it a tough sell at its asking price. The Mark II puts a huge (for a compact) 1.5-inch image sensor into a body that’s a bit more sleek. The resolution of the sensor has been reduced from 14 megapixels to a 12.8-megapixel chip that can be set anywhere from ISO 100 through 12800. The Digic 6 image processor, part of Canon’s HS system, promises to deliver improved performance.

The camera also features a new lens. It’s now a 24-120mm f/2-3.9 design. It’s a wider lens with a longer zoom ratio and full-stop faster throughout the zoom range than the 28-112mm f/2.8-5.8 that the original G1 X used. There are two control rings around the lens—one is a step ring that can be used to adjust shooting settings, and the other is a stepless design that can be used for manual focus or to adjust settings.

The G1 X Mark II drops the optical viewfinder that added to the original incarnation’s bulk completely. This is no great loss, as the G1 X’s viewfinder was very small and not that accurate in terms of framing. The Mark II features a tilting rear display, so you can adjust it for better use on bright days or to hold the camera at a more interesting angle. And if that’s not a sufficient substitute, an add-on electronic viewfinder is going to be made available. And, as you would expect from a top-end camera, Wi-Fi with support for NFC is built in, so it’s easy to move photos to your smartphone for quick social sharing when out and about. Remote control via your iOS or Android device will also be supported.

The G1 X Mark II is set to go on sale in April. It’s priced at $799.99; that’s $50 more than our current favorite top-end compact camera, the Sony Cyber-shot DSC-RX100 II($598.00 at Amazon)(Opens in a new window), but Canon has outfitted the Mark II with a significantly larger image sensor, and a wider, longer zoom lens that captures more light through most of its zoom range.

If you want a camera with a big sensor, but don’t want to pay the premium that a top-end compact like the G1 X commands, Canon is bringing a new entry-level D-SLR to its lineup. The EOS Rebel T5 replaces the aging T3, and incorporates many of the technical advancements from the T5i($899.00 at Amazon)(Opens in a new window), at a lower price point. The T5 features an 18-megapixel APS-C CMOS sensor, a DIGIC 4 image processor, and an ISO 100-6400 capture range, with ISO 12800 available as an extended setting.

It can fire shots at 3 frames per second and record video at 1080p. It uses the same autofocus system as the T5i—a 9-point setup with a cross-type point in the center of the frame—but its 3-inch rear LCD is fixed, so you’ll need to move up to the T5i if you want a vari-angle display. The T5 is priced at $549.99, including the EF-S 18-55mm f/3.5-5.6 IS II zoom lens. It will go on sale in March.

There are also some updates to the PowerShot lineup. The SX700 HS is a slim superzoom with a 30x (25-750mm) lens, integrated Wi-Fi with NFC, and a 16-megapixel CMOS sensor powered by the DIGIC 6 processor. It will be available in March in black or red, and is priced at $349.99.

The PowerShot D30 is a replacement for the aging D20($369.99 at Amazon)(Opens in a new window). The go-anywhere compact can operate underwater, as deep as 82 feet—which is unmatched in this class. It can operate in temperatures as low as 14°F and as high as 104°F, and survive drops from 6.5 feet. The image sensor is a 12-megapixel CMOS design, and GPS is built in. Like the D20, it will be available in blue. It is priced at $329.99 and will go on sale in April.

Canon is dropping its A-series of PowerShots, instead choosing to brand its entry-level cameras with the more prestigious ELPH designation. Three new low-cost Elph models are being added to the lineup. The Elph 135 is a 16-megapixel CCD shooter with an 8x zoom lens; it will be sold in black, silver, red, or purple. It’s priced at $119.99.

The Elph 140 IS also uses an 8x zoom lens and a 16-megapixel CCD, but it adds optical image stabilization. It will sell for $129.99 and will be offered in gray and red. Finally, the Elph 150 IS improves the lens to a 10x design and adds some resolution thanks to a 20-megapixel sensor. It’s priced at $149.99 and will be sold in in blue, red, silver, and black. The three new Elph cameras will go on sale this month.