changed remaining __() to _i()