Extension now fully ported over to the Right Way