modifications for comparable binary sizes