Newer version with improved pipeline