First pass improvements