Simplified build a bit