Reduced binary size abit