Slightly more "modern" build